From 6316960e4389a13911d5fb809769f8b2ec3fd79b Mon Sep 17 00:00:00 2001
From: robertl <robertl>
Date: Sun, 6 Sep 2009 05:04:07 +0000
Subject: [PATCH] Setup tweak to include license.

---
 gui/setup.iss    | 11 ++++++-----
 gui/setup.iss.in |  9 +++++----
 gui/upgrade.cpp  | 13 ++++++-------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/gui/setup.iss b/gui/setup.iss
index c378921b6..5a1479d23 100755
--- a/gui/setup.iss
+++ b/gui/setup.iss
@@ -1,4 +1,4 @@
-; $Id: setup.iss,v 1.4 2009/09/06 00:09:13 robertl Exp $
+; $Id: setup.iss,v 1.5 2009/09/06 05:04:07 robertl Exp $
 ;
 ; Script for generating installation setup program for GPSBabel
 ; Uses the Inno setup compiler.  Typically used from the command
@@ -25,6 +25,7 @@ OutputBaseFilename=GPSBabelSetup
 SetupIconFile=images\babel2.ico
 Compression=lzma
 SolidCompression=yes
+LicenseFile=COPYING.txt
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -75,10 +76,10 @@ Source: gpsbabelfe_de.qm;           	DestDir: "{app}\translations"; Flags: ignor
 Source: qtdir\translations\*;  		DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 ; Miscellaneous
-Source: COPYING;			DestDir: {app}; Flags: ignoreversion
-Source: AUTHORS;			DestDir: {app}; Flags: ignoreversion
-Source: README.contrib;			DestDir: {app}; Flags: ignoreversion
-Source: README.gui;			DestDir: {app}; Flags: ignoreversion
+;Source: COPYING;			DestDir: {app}; Flags: ignoreversion
+;Source: AUTHORS;			DestDir: {app}; Flags: ignoreversion
+;Source: README.contrib;			DestDir: {app}; Flags: ignoreversion
+;Source: README.gui;			DestDir: {app}; Flags: ignoreversion
 
 
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
diff --git a/gui/setup.iss.in b/gui/setup.iss.in
index 01044558b..f79ebe309 100755
--- a/gui/setup.iss.in
+++ b/gui/setup.iss.in
@@ -1,4 +1,4 @@
-; $Id: setup.iss.in,v 1.1 2009/09/06 00:09:13 robertl Exp $
+; $Id: setup.iss.in,v 1.2 2009/09/06 05:04:07 robertl Exp $
 ;
 ; NOTE: setup.iss is generated from setup.iss.in via autoconf.
 ; The generated setup.iss is checked in to help keep the version numbers
@@ -29,6 +29,7 @@ OutputBaseFilename=GPSBabelSetup
 SetupIconFile=images\babel2.ico
 Compression=lzma
 SolidCompression=yes
+LicenseFile=COPYING.txt
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -80,9 +81,9 @@ Source: qtdir\translations\*;  		DestDir: "{app}\translations"; Flags: ignorever
 
 ; Miscellaneous
 Source: COPYING;			DestDir: {app}; Flags: ignoreversion
-Source: AUTHORS;			DestDir: {app}; Flags: ignoreversion
-Source: README.contrib;			DestDir: {app}; Flags: ignoreversion
-Source: README.gui;			DestDir: {app}; Flags: ignoreversion
+; Source: AUTHORS;			DestDir: {app}; Flags: ignoreversion
+; Source: README.contrib;			DestDir: {app}; Flags: ignoreversion
+; Source: README.gui;			DestDir: {app}; Flags: ignoreversion
 
 
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
diff --git a/gui/upgrade.cpp b/gui/upgrade.cpp
index 608917c92..a5ca12835 100644
--- a/gui/upgrade.cpp
+++ b/gui/upgrade.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-// $Id: upgrade.cpp,v 1.13 2009/09/02 19:05:27 robertl Exp $
+// $Id: upgrade.cpp,v 1.14 2009/09/06 05:04:07 robertl Exp $
 /*
     Copyright (C) 2009  Robert Lipe, robertlipe@gpsbabel.org
 
@@ -67,7 +67,7 @@ QString UpgradeCheck::getOsName(void)
 // See http://doc.trolltech.com/4.5/qsysinfo.html to interpret results
 QString UpgradeCheck::getOsVersion()
 {
-  #if defined (Q_OS_MAC)
+#if defined (Q_OS_MAC)
   switch (QSysInfo::MacintoshVersion) {
   case QSysInfo::MV_10_3: return "10.3"; break;
   case QSysInfo::MV_10_4: return "10.4"; break;
@@ -75,25 +75,24 @@ QString UpgradeCheck::getOsVersion()
   case QSysInfo::MV_10_6: return "10.6"; break;
   default: return QString("Unknown Mac %1").arg(QSysInfo::MacintoshVersion);
   };
-  #elif defined (Q_OS_WIN)
+#elif defined (Q_OS_WIN)
 
   switch (QSysInfo::WindowsVersion) {
   // Wildly improbable...
   case QSysInfo::WV_95: return "95"; break;
   case QSysInfo::WV_98: return "98"; break;
   case QSysInfo::WV_Me: return "Me"; break;
-#ifdef XXX
+
   case QSysInfo::WV_4_0: return "NT 4"; break;
   case QSysInfo::WV_5_0: return "2000"; break;
   case QSysInfo::WV_5_1: return "XP"; break;
   case QSysInfo::WV_5_2: return "2003"; break;
   case QSysInfo::WV_6_0: return "Vista"; break;
   case QSysInfo::WV_6_1: return "7"; break;
+  default:
+      return "Windows/Unknown";
 #endif
-  default:;
   }
-  return "Windows";
-  #endif
   // FIXME: find something appropriately clever to do for Linux, etc. here.
   return "Unknown";
 }
-- 
2.30.2